Removed unneed stuff