Cleaned up a retarded stuffs.