Removed some extra stuff that are no longer needed