Started to delete unnessesary code