Removed unescesary code