Removed garbage functions, fixed warning on line 108