Cleaned out useless functions