Removed useless stuff we don't need