Code refactoring

removed comentaries and also fps object removed