Cleaned up everything :cry: from the branch