Removed obsolete function
Added less compilation