cleared some code