Removed useless functions