Removed a few things creating issues