Removed unused code, made for 'convenience' methods