Removed an old debug function
Added getAverageFPS function
Resolving merge conflict