Removed redundand stuff