removing functionality for greater consistancy