Removed everything temporarily to try and make everything work