Deleted unnecessary methods, added solving

Also deleted square as it is not needed anymore.