diff --git a/application/core/Callbacks/CallbackManager.php b/application/core/Callbacks/CallbackManager.php
index 54baa1ca..4fb706ac 100644
--- a/application/core/Callbacks/CallbackManager.php
+++ b/application/core/Callbacks/CallbackManager.php
@@ -16,14 +16,6 @@ class CallbackManager {
 	/*
 	 * Constants
 	 */
-	// ManiaControl callbacks
-	/** @deprecated Use Callbacks Interface */
-	const CB_ONINIT = 'Callbacks.OnInit';
-	/** @deprecated Use Callbacks Interface */
-	const CB_AFTERINIT = 'Callbacks.AfterInit';
-	/** @deprecated Use Callbacks Interface */
-	const CB_ONSHUTDOWN = 'Callbacks.OnShutdown';
-
 	// ManiaPlanet callbacks
 	const CB_MP_SERVERSTART               = 'ManiaPlanet.ServerStart';
 	const CB_MP_SERVERSTOP                = 'ManiaPlanet.ServerStop';
@@ -52,15 +44,16 @@ class CallbackManager {
 	const CB_TM_PLAYERINCOHERENCE = 'TrackMania.PlayerIncoherence';
 
 	/*
-	 * Public Properties
+	 * Public properties
 	 */
 	public $libXmlRpcCallbacks = null;
 	public $shootManiaCallbacks = null;
 	public $trackManiaCallbacks = null;
 
 	/*
-	 * Private Properties
+	 * Private properties
 	 */
+	/** @var ManiaControl $maniaControl */
 	private $maniaControl = null;
 	/** @var Listening[][] $callbackListenings */
 	private $callbackListenings = array();
@@ -68,7 +61,7 @@ class CallbackManager {
 	private $scriptCallbackListenings = array();
 
 	/**
-	 * Construct a new Callbacks Manager
+	 * Construct a new callbacks manager instance
 	 *
 	 * @param ManiaControl $maniaControl
 	 */
diff --git a/application/core/Maps/MapManager.php b/application/core/Maps/MapManager.php
index d1e021b1..73334fc6 100644
--- a/application/core/Maps/MapManager.php
+++ b/application/core/Maps/MapManager.php
@@ -46,11 +46,6 @@ class MapManager implements CallbackListener {
 	const SETTING_AUTOSAVE_MAPLIST        = 'Autosave Maplist file';
 	const SETTING_MAPLIST_FILE            = 'File to write Maplist in';
 
-	/**  @deprecated Use Callbacks Interface */
-	const CB_BEGINMAP = 'Callbacks.BeginMap';
-	/**  @deprecated Use Callbacks Interface */
-	const CB_ENDMAP = 'Callbacks.EndMap';
-
 	/*
 	 * Public properties
 	 */
diff --git a/application/core/Settings/SettingManager.php b/application/core/Settings/SettingManager.php
index 0eb1fa41..4e1283bd 100644
--- a/application/core/Settings/SettingManager.php
+++ b/application/core/Settings/SettingManager.php
@@ -21,13 +21,13 @@ class SettingManager implements CallbackListener {
 	 */
 	const TABLE_SETTINGS     = 'mc_settings';
 	const CB_SETTING_CHANGED = 'SettingManager.SettingChanged';
-	/** @deprecated Use CB_SETTING_CHANGED */
-	const CB_SETTINGS_CHANGED = 'SettingManager.SettingChanged';
 
 	/*
 	 * Private properties
 	 */
+	/** @var ManiaControl $maniaControl */
 	private $maniaControl = null;
+	/** @var Setting[] $storedSettings */
 	private $storedSettings = array();
 
 	/**