Removed unused code!