refactored
remove unused function
removed unused rsources