Removed unnecessary stff