Fix file layout. Removed useless methods