Remove use of date() and validate beats