Removued unused stuff, cleaned up things