Removed non-related stuff