Removed unneed stuff, update stuff =)