Removed ajax calls and general cleanup