Removed Unnecessary stuff