Removed unesesary code