Removed unused functions, fixed semicolons