Cleaned up references not used on the server
Cleanup on using directives and added a sync now method