chore(cleanup): Cleaned up core files.

Conflicts:
 - engine/lib/session.php
chore(cleanup): Correction after cleanup modifications to web_services