Removed unused function
Merged changes