Cleaned up unused logic and added some tagging method stubs