Cleaned up useless functions