Removed everything unnecessary