More updates. Removal of depreciated stuff and misc cleanup.

Signed-off-by: SkyFire <admin@projectskyfire.org>