Removed the tag stuff until Travis bug is fixed